bin/deploy: Avoid loading merge deployment kargs unless necessary
authorColin Walters <walters@verbum.org>
Fri, 27 Apr 2018 15:58:50 +0000 (11:58 -0400)
committerAtomic Bot <atomic-devel@projectatomic.io>
Fri, 27 Apr 2018 17:48:21 +0000 (17:48 +0000)
commit06d39efcb5ad52216a2a47b5eff71af82c0dae49
treeee4b70ac72138e48873036e38499823208f4a26e
parentde4c7105f019f514a56f0ec6911b865b3f2d58a1
bin/deploy: Avoid loading merge deployment kargs unless necessary

The fact that `ostree admin deploy` always itself loaded the
merge kargs masked a bug in the core.  Let's change our tests
to not pass any kernel arguments to ensure we cover this.

The new logic in the CLI is a bit subtle, but if you read
carefully is a lot clearer I believe.  Basically we have one
of a few "starting points" in the first section, which can
then be further augmented.

Closes: #1558
Approved by: jlebon
src/ostree/ot-admin-builtin-deploy.c
tests/installed/destructive/staged-deploy.yml